API Update for AWS Support