Add a flag to disable registration