some updates for timeField and Language