added support for timepicker as well