Added epoch to date conversion