Mark a property as yes/no water usage is charged and have this automatically filter to the tenancy (perhaps with the ability to override for extenuating circumstances). This way each new tenancy will always reflect the property rather than having to look it up with each new tenancy and recall why water usage is/isn't charged (would also be good if it was a NO that a reason could be entered so that future property managers arent left scratching their heads