Add support for resource deletion (and minor updates)