changes to work with refactored CM/SM, store operation source