Added internal filtering capabilities