Added saving data in db, updated client and server