Adding more support for quests