Update to new APIs

## TODO

* [x] Remove deprecations based on specs
* [ ] Manually test a bit