Moved model data modification to controller