Add SWAP support