WorkplaceMapper added