Port to Scala 2.11