Refactor and improve coverage on diagram generation
Refactor to push subnet labeling logic down to Builders as with other ec2 model objects