Add The Single Responsibility Principle