Updated entities, mapper and controller

	Reviewed by: Robert