change some strings to Date class