Remove computation of relative addresses
Fix to use new address type