Added host session handling