Example updated based on API 5 updates