Modified to Support Date Col