Add extra fields for flexibility