#125: Support dynamic fields