Started simplifying session manager