UserDao refactoring