Rewrite provider to handle configuration better
merged documentationen