Further work on resources
Further work on resources
Renamed to proxy