Added FileStream and MemoryStream