Started implementing session management