Upgraded FirebaseCtrl