Added multi-class control for Controller