FORGE-1909 refactor resource API