Adding IDs to tokens