Added some EC2-specific extensions (mixins)