More indexes and defined relationships