updating to use dovetail instead of pluggable