Reimplemented SessionIds and Tokens as classes