Updating to latest comp type definitions from main nml2 repo