Minor changes to Find Client interface