Combined some attributes and got rid of many handshake_states