Added more flexible configuration system