Added option to add Date properties