Added Scala mode