Added support for NumberPicker
Enhanced NumberPicker support