Refactoring session and U