migrate to new aws util