Added moment js and date parsing