merging wathsala's changes using new indices for metadata keys