Add missing element
Improve date handling