Refactoring and some updates of  Items