Update for scala-2.10