Added more categories and one utility class