Update to v0.2/ API support