Refactoring: New simple classes for scalability solution