Add more fields from ec2