STORM-80 : Updated some minor changes