Updates to controllers and also added operation classes