update to dynamic field handling