Add new steps for the client and the server