Add Scala support