Refactor controllers to use new non-static proxies