Updates to AWS map