Added better item recognition