Save dynamic fields

Signed-off-by: Oz Ramos <>