Added handling for some changes in SMW 1.9

Change-Id: Iba45c73fab21ee10a387f2e915068cda0ad0a3ae