Change to use single resource handle