memory performance improvement
small provider bugs correction
Provider bug fixup