Removed the need of separate identities for store NPCs