Add concurrency and fix date parsing