Changed User entity and DAO