Added dao and ServerConnector