Ensure Schema handle datetime objects appropriately

Change-Id: I52c436371d65757d8bcd2d18106465f1f7ee73fe