Added `user_token` to uniquely identify users by token
Fixed namespacing problems