Add unfinished remote resource handling code