Refactored Config class