Added support for Scala