Fixed error caching
Added Stream classes