Refactored EC2 APIs