add user + token support