Add some Scala goodness!