Updated to be pluggable