Adding wms_store support