More work on the Configuration module.