Changes needed for the new fields