Added ability to get token from client