Added code to support using AWS API