Make controller requests async
Add token support