Added cleaner plugin support.