Add more functionality to Find()