New changes to the controller framework