Refactor CEL to avoid using the event system core