Updated so that mapper doesn't need to have run to find external resources