Minor cleanup of new model relationships
Added indices to new tables