Making sure Address class is backward compatible with v3, #SB-99 fixed