Added class controller