Made some arguments required as well adding filter support.