Code refactor for composite nested access support preparation