Add "Common" support for AWS