Changed initial value of DateOfDelivery
Corrected use of KeyValueStore