Refactor Sessions