incorporate HeavyWater changes for attributes