make more generic for AWS