Added all relevant CL calls