Prep for move to Instant from Date