Indexes refactor - look, aliases, added rels index