Extend return_dict to include nested addrnum