Added plugin functionality