Improve QuestBuilder / ObjectiveBuilder / OutcomeBuilder