Fixed extra fields management