Added Scala support