Enhance: Compatibility with CJT latst Framework version