#2 add Session manager