Added address-class