Improved Swap creation