Added parsing for dates