Added handshaker and dbhelper