Refactored streaming adapter by using own buffer queue