Adding support for WH collection