Changed structure for including a "Common Plugin" into it