Added streaming support