Fixed EntityMap integration with Adapter and Mapper implementations; fixed type conversion integration with classes