Add support for ordered sets