Adding IDisposable to Stream readers and writers, updating database format