Moved client filters into a trait