STORM-80 : Trying some logic to bringup universal process properly