New firebase structure
Corrected date