Refactor to pick up functions in aws-sdk.