Refactoring Domain Problem in CheckinTool