Fix up controller manager logic.
Add scopes.