Added token, nonce, date, password logic