update to include CL and PL stubs