Adding ViewModel, Session handling, etc.