Added new configuration system