Adding more to OPF, also utilizing an OrderedSet data structure