Improve plugin pluggability