Well, a big part has already been moved to the matchers. But if you can think a way to provide more flexibility, I'm in!