Added setup for streaming, added modules