Redesign item model