Move extra properties from controller to service