added tokens and some helpers