added number field support