Plugins API expansion & update

Plugins API expansion & update
Space before and after `//` here