Using latest nml2 comp type defs