Re-added aws code