Added logic for dynamic field values