Added controllers to faciliate Seperation of Concern