Updated Firebase DB Structure