Npc entity branch