Adding flag to control args