Fix Imports and Item's ids