Updated for Scala version 2.10.2