Add DateTime support, fix for 1.8.7