Adding envers support (contribution from Victor Tatai)