Fixed TokenManagement