Changed controller registration logic