Refactored dynamic fields to match discussions about making it simpler (add only)