[core] architectural changes