Added various controller and models