Update template to match up with latest native code within CADT