Ensure we are always using `addressing` attribute