make tokens forward compatible