Moved filter tasks to trait