Relationship class revamp to include TokenType #44