Updated database model to handle correctly loading the items.