Update output to ensure proper sws context creation