Adjust demo to the new API methods.