Use new API & analytics