Migrated to Scala 2.10