Mapper now handles entity