template improvements to support rendering system schemas