Support for Scala 2.10