Add indexing data relations for #16