Refactored Point
Refactoring in progress, change of architecture