Refactored plugin configurations and removed redundant executions