Adding missing ivars to SWTxxx classes