Updated to be conform to API v3 call changes