[Refactoring] Repair of funcionality Model