Change visit resource nesting, and index defn