Update the `diagrams` tool to ensure that external entities are always draw in a separate cluster