EC2 has been moved to class