Simplify Payloads dependencies
Start on data layer filters