Pluggable drift

Code for review