Updated to work with FileCleaner frame support