Changes for new awestruct