Added required filters + cleanup