Changed architecture of thing completely