Please don't forget to add those to the API docs when this pr is ready.