Decoupling of substruces.png