Add dynamic fields handling