Using the new schema in Firebase