Add support for resource IDs in new API