I was suggesting to have something like proxy.features.TEMPLATES, proxy.features.PUPPET and everywhere in the code refer to that, but that would be a bigger refactoring that's not really in scope for this PR.