Better API integration