Re: Make one-shot a per-registration property