refactoring session options