Work in progress for interprer config PropertySourceMode refactoring