Replaced id's by tokens
Small fix
Change hash algorithm
Replaced id's by tokens