Adding Filter support, update pushes next