Make things more config-y