HHH-7917 : Add support for ordered sets