multi-provider support and defect fixes