Refactored config template