Migrate remaining classes to Scala