Updated to use new GCJ registry in core.