Update use of find functions