Added to controller class