Refactor, Index methods & UML