Update for Scala 2.11