Added rudimentary stream support - major refactor and optimization
needed
Updated support library