Add nicer finders