Adding missing controllers. Updating configurations