Added linear and composite indexes.