#CloudPlatform Refactored token stuff