Better API usage