Made some changes in item model and service