Additional AWS functionality [#56591890]