Updated firebase changes