Added simple session control