Update for Scala 2.10