Updating examples & comp type defs to latest from nml2 repo