Plugins API expansion & update

Plugins API expansion & update
Formatting nitpick: Always have a space after // in comments.