Add full ec2-user support