Adding support of number and select field types