Migrated models to components instead of children