Added server and client proxy