Adding CL to the Compiler Refactor