Add proper remaining items handling.