Fix platform bugs
Add information about how we map between clusters to the output graph