More Scala friendly