Fixed demo again...
Removed stream inheritance from core module (temporary)