Start adding session handling