Revisions to structure APPENG-2905