More configuration support