Add blacklist folders and enhance code