Added configuration module/ Refactored the previous codes