Changing the Client interface to use only one method, which takes a Criteria.