Made things far more pluggable