Better controller managment