Added NPC Class