Updated AWS Classes