Addressed peter review comment(stormflash framework) -  Master Story : STORM-47