Update to use preferred API methods

- [ ] CI created and passed
- [ ] Peer review