Added support for new categories and new merchants