Adding params to start if present

Change-Id: If3dcfc8399af079f6ee638ea46bfa44d235d10dc