This refactor will solve #2720 & #2943 , and simplify future iteration on the graphQL API
This refactor will solve #2720 & #2943 , and simplify future iteration on the graphQL API