AWS Classification changes for NSWE products