Added initial stream implementation