Updated for API v0.7.2