Updated Heyzap adaptor