Updating to latest nml2 comp types