Add support for plugins

Same here - Can we adjust the spacing back to 2?