Rewrite JCCHandler to CoreHandler