support for GenericEntityMaps, cleaned pom files