Updated Date and Calendar handling.