Added ConnectionManager and FileManager