Added argument filtering to CLI