Moving over to Scala 2.10