Added DAOs and ServerManager