Add minor EC2 resources
Add CF and make more pluggable