Refactor modifications into Item base class