Added support for number and date fields autodetect