Update to use new API