Change addr fn to AddressOf trait