Added some 'model' elements and made some changes to support editing of
Items.