Session refactoring
Utils restored