Switch back to resource based metadata retrieval
9 files changed