output mapper refactor to deal with dates better