working on token schema