Changed XML output for new schema.  Added placeholder annotations.