Add basic class
Merge branch 'feature-add-user-session-managment'