Added basic configuration system