Modified to support item number