more flexible wrapper support
v0.0.9