Added product and Category classes