Good point. That's probably something we should do, not necessarily part of this PR though. This is actually just copied over from the core-code, so we do not have to use the core condition base class. Would you like to create an issue for it? :)