Finish nested templating support