Refactor Relationship Indexes