Reworked additional item handling