Better API support