Added comments for server & management viewpoint