moved tokens to api schema