Update to pass CR class to plugin registration