Added NPC class