More plugin support work.