Refactor add functionality, add build_using_questions method