Rewrite configuration to be modular