Updating to latest schema & comp type defs from main nml2 repo