All the Model changes replaced to the Controller