Add derived fields separately