Converted to scala 2.10 and migrated required code