Remove dependecy to Finder