Updated for Scala 2.10