Improved API return values