Added CL arg functionality