Updated for User and Org API calls