Added support for Spark and CoRD