Added CL utilities