Follow documentation changes