Change to is_water and add more residue name