Added Id to IItem + small refactorings