#413 Add date conversion