Added a configuration system