few changes related to idempotent storage manager