Minor API upgrade