Added stream/file handlers and manager