Implement new configuration system