More API changes to return a value when possible