Refactoring session calls