Adds latest comp type defns from nml2 repo