Added basic code for the client-server support.