Making configuration more consistent.