Adding Scala goodness