Some controller refactoring.
Merge branch 'feature/TokenListener'