Update to latest Resource Handling API changes