Updated session builder