Migrated to scala 2.10