changes to sync up with storemate, operation source addition