Sessions Refactoring

Sessions Refactoring