Added some more changes as per Peter's comments : STORM-76