Updated for new API endpoint versions and new constants