Properly work out which fields are derived