Firebase references reflect new data structuring