There are different approaches that drive the development and use of educational software, such as Interactive Geometry Systems - IGS and Intelligent Tutoring Systems - ITS. Considering their benefits to teachers and students, these systems may be used to complement each other. The ongoing development of ITS features in an existing IGS called iGeom is presented. First, the limitations of both approaches are listed, describing possible benefits of using them together. Then, the resulting component architecture of the conducted analysis and software design is outlined. The ITS paradigm chosen was Example-tracing Tutors. The current state of research is the tutoring features implementation and planning for testing in classrooms and in distance learning courses.