Added update, and updated Handshake definitions to take variables for user information