Can you please add the following Streams to the Waste section,

Oil, Per Litre

Oily Water, per Litre

Oil Filters - Per 44 gallon drum