Enhancing an Extensible Query Optimizer with Support for Multiple Equivalence Types