Changes supporting new kalutra client & default categories to a dictionary