Fixed some issues in refactoring : STORM-80