Added session managment