Adding indexes and relationships