Updated for CL export