Refactored config source model