New pluggable API
0.3.0