Updated XML defns to support multi make code