Added date picker support for chooser