Schema and template modifications