Updates to template schema and wizard