re-merging Move more responsibility to common EC2 module