Few optimizations for the CPT module