Made thor dependency more flexible.