Small patch to remove explicit dependency on Resource