Server and client solutions added