Added configuration system