Improve provision and update docs accordingly