Changes to move to AWS