Added Java/Scala