added more validations on items