CM extraction fixed, ES KB extended