Attempt at supporting date type