Tidying Up
Template Import from schema