Adding Date Support in Timestamp