Comment on Add plugin support