Updated to refactored time_date_parser