Changes according to API

Inclides some NMS changes, outdated as it is