Session tracking and mutliline statements add