Added plugin parameter and cleaned files