Added more paramters to the aggregate group _id