Orlando schema and template additions [MRB]