Changed architecture. Added thor.