Google CL enhancement