Remove the default filtering parameter
Include additional modules in Client class