Simplify configuration and make more consistent.