Removing old fields and adding new fields. DHH-75