Added support for Scalding