Added FirmAddress logic