Add WN8, etc.