Added new fields to solve #2784