Changed data structure and aligned with angularFire seed project