core: migrate to connected (1/2 - not compilable)