Added date parsing