Added Controller configuration