Make plugins slightly more pluggable