Improved API usage