extended the API to allow for specification of index Type and value type in case of EntityMaps