Migrate to Scala 2.11. Refactoring