Optimized imports
Added ItemId
Added reference package