Add setting to enable/disable default controller being setup