See comment below re: API changes