We're currently designing a whole configuration overhaul so it's part of wider piece of work, we do have a note on the jinja stuff atm that say it's a bit of a hack (IIRC)