Made some changes to the swid generator part