Added NPC Transform mask
Renamed PNPC to TransformId, and other methods