Added sessionid awareness