debug: Make use of new API format