Adds better item parsing