Refactored into multiple config providers