Improved handling and added additional resources for handling conflicts with other controllers.