Added CEK and TCE validation feature