Starting work on changing SessionStore