Update to support FDZone