Add client and server structs