Refactored Config file