changes for date conversion in model