Explode extra fields everywhere, and encapsulate it separately.