More changes for supporting execution history