Added Scala stuff