Only insert extra_info if actually present