Decoupling more of the functionality into pluggable items.