MOB-104: Updates to Firebase structure