Fixing API setup