Update to be compatible with API 0.13.1