Update documentation and changed some provider internas
Small import fix