Match common function API changes