Added server and client commands