Feature/amazon sdk2.0