Add singleton for Comparator class.
Use OrderComparator instead of WeightedFactory.

  - Works nicely with future use of OrderComparator for all plugins.