Using the new generated API