changes due to new idempotent storage manager api