Switched to the new client class in EC2 backend