adding session handling