Add HKG support