Add a more generic find function