session / config management code added