Added more fields to metadata for the index.
Changed resource path computation.