I'm wondering whether we should have it here or in general config