Updated for api v1.1