Latest CP jar with minor query relatd modifications