Added better date picker support