Add customer group options and re-fatoring of the product and category check