Improved AmazonPreprocessor