(main): Modify for new API.