Added thing and rotor classes