Made it consistent with existing way of running and documentations.