Modify to remove groupId from parameters - it is a configuration item