Did work on the TheoryComponent and relevant classes