Updated app/models