Fixed typo and added more GA support