Adding more filtering options. External targets can now be chained too