Added Firebase support
merging