Updated mappers to extend GenericDoctrineMapper + updated some typehints