Switched to new firebase api