I don't see Invalidating features being used here. So I'm not 100% sure we should add it. I guess this might be for users that want to use that feature? Maybe we could start without it and see if we need to add it later?