Updated for new date picker items