Change API to return objects in many places that returned ints