Add plugin support.
merge