Refactoring to remove 'outlet' column from attr tables. Also, rename ids to be clearer.