Updated to contain information needed by the server