Extract diffitem in its own class