Updates to base controller