Made CL3 more library-friendly