Added user tokens and states handling