Patched issue where address type was not serializing properlty to JSON