Merge DimensionSelectorFactory into ColumnSelectorFactory