Reverted prefix construction. Added group.