Improved API