added AWS CLI support