Changes to retrieval
Rewriting resource retrieval