Added task controller and model