Adjusted Coordinator compatibility.