Added suport for Time and better date formatting