schema and template changes