Added ThingId and unit test