1) Updated entity "User" and references to it.
2) Updated UserDao.