These are the changes for https://github.com/ncsa/oa4mp/issues/232, but implemented in the base StoreCommands class so they are simply integrated for all components.