Added more fields to save.