Added regroup<->entry relation