Renamed the session class again, added more functionality