Add discard support for swap