Completed the Fields addition and removal.