Better quests support