Updated for Scala 2.10.0