Adding Plugin Class to refactor plugins