Updated UserDao, App and Content