Updated virtual session implementation and added option to disable it