Drinking water systems