Simplifying to be more "pluggable".