Adjustments to api to support separate findAll() and find() actions.