Use TimeField and DateField instead of Date and Time

Original one is not documented and ruby have problem with Date and Time caller as it
cloak original ones.