Split up date & time input & add extra fields