Better controller managing