Updated Finder usage