Adjust struct and modify server