Upon treatment completion, the subjects with drug-sensitive tuberculosis will be provided with sufficient doses of standard of care tuberculosis treatment, as appropriate, to cover the time period from attending their last visit at the study clinic until their scheduled visit at the TB clinic. All subjects with drug sensitive and multi-drug resistant tuberculosis will be referred to the local community tuberculosis clinics for standard anti-tuberculosis chemotherapy according to National Tuberculosis Guidelines.