Use API 1.0.1 + implement changes.