So, I feel like it would be better in the spirit of Whirr to keep anything EC2 related out of the ClusterSpec. Seems like the ClusterSpec should expose a "mapping map" and the creation of the BlockDeviceMapping object would be done in the BootstrapTemplate (which is already "dirty" in the sense that is pulling in EC2 specific classes).