Update to new controller registry API