Updates to the code and reworked SessionTypes so that getEnum returns
the correct object.