AWS improvements