Added support for representing swapped points