Port to Scala 2.10