Add Pluggable interface and implementation