Reverted latest approach with specialized Coreginx. It turns to be much simpler case.