Added date element support