STREAMS-139 | Modified buildProvider to make logic more understandable