Updating comp type defs and example from nml2 repo