Added more configuration; Added configuration module