Finish the client 1.8.0 module