more API resource consolidation