Added Group hiearchy and product groups