While the proposal focuses predominantly on tobacco, it also extends the directive's scope to include products that do not contain tobacco, but nicotine, such as electronic and herbal cigarettes. Their marketing material must now carry health warnings.