Added functionality for NPCs