Update the logic component with more OO classes. OpenClosed Principle