- Added AWS-support