Scala 2.10.1 support