Added new NPC Class and some support for it.