updates for changes in s-c-commons