Initial changes to controller proxy