Added plugin source from previous feature branch