Add support for v15 APIs