Updating to latest Schema & NML CompType definitions