updated structure changes related to PR-862