Refactoring/Config file added