Updated resource resolution order