Migrated more components to constructor injection