Added basic session management
Simplified current functionality