Updated for Scala 2.11