Add advanced filtering support