Cleaned up session / update session implementation