Adapted Controller to fresh Model changes