Added support for streaming core